From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 18 Jun 2014 20:36:49 +0000 (-0700)
Subject: Add a .travis.yml
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~994^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=d68719566a2a4b89d5115a66d7e600319c5d3e21;p=cargo.git

Add a .travis.yml
---

diff --git a/.travis.install.deps.sh b/.travis.install.deps.sh
new file mode 100755
index 000000000..578c004cc
--- /dev/null
+++ b/.travis.install.deps.sh
@@ -0,0 +1,21 @@
+set -ex
+
+# Install a 32-bit compiler for linux
+sudo apt-get update
+sudo apt-get install gcc-multilib
+target=unknown-linux-gnu
+
+# Install both 64 and 32 bit libraries. Apparently travis barfs if you try to
+# just install the right ones? This should enable cross compilation in the
+# future anyway.
+curl -O http://static.rust-lang.org/dist/rust-nightly-x86_64-$target.tar.gz
+curl -O http://static.rust-lang.org/dist/rust-nightly-i686-$target.tar.gz
+tar xfz rust-nightly-x86_64-$target.tar.gz
+tar xfz rust-nightly-i686-$target.tar.gz
+cp -r rust-nightly-i686-$target/lib/rustlib/i686-$target \
+      rust-nightly-x86_64-$target/lib/rustlib
+(cd rust-nightly-x86_64-$target && \
+ find lib/rustlib/i686-$target/lib -type f >> \
+ lib/rustlib/manifest.in)
+sudo ./rust-nightly-x86_64-$target/install.sh
+
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..b51759b1a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,16 @@
+language: rust
+
+install:
+  - ./.travis.install.deps.sh
+
+script:
+  - make CC="$CC" RUSTC="$RUSTC" -j4
+  - make CC="$CC" RUSTC="$RUSTC" test -j4
+
+env:
+  - ARCH=i686 CC='cc -m32' RUSTC='rustc --target=i686-unknown-linux-gnu'
+  - ARCH=x86_64 CC=cc RUSTC='rustc --target=x86_64-unknown-linux-gnu'
+
+os:
+  - linux
+  - osx
diff --git a/Makefile b/Makefile
index 23a2fed59..b6c08637f 100644
--- a/Makefile
+++ b/Makefile
@@ -23,17 +23,17 @@ all: $(BIN_TARGETS)
 # === Dependencies
 
 $(HAMMER): $(wildcard libs/hammer.rs/src/*.rs)
-	cd libs/hammer.rs && make
+	$(MAKE) -C libs/hammer.rs
 
 $(TOML): $(wildcard libs/rust-toml/src/toml/*.rs)
-	cd libs/rust-toml && make
+	$(MAKE) -C libs/rust-toml
 
 $(HAMCREST): $(shell find libs/hamcrest-rust/src/hamcrest -name '*.rs')
-	cd libs/hamcrest-rust && make
+	$(MAKE) -C libs/hamcrest-rust
 
 # === Cargo
 
-$(LIBCARGO): $(SRC) $(HAMMER)
+$(LIBCARGO): $(SRC) $(HAMMER) $(TOML)
 	mkdir -p target
 	$(RUSTC) $(RUSTC_FLAGS) $(DEPS) --out-dir target src/cargo/lib.rs
 	touch $(LIBCARGO)